Merged from trunk
authorJason Rumney <jasonr@gnu.org>
Wed, 27 Jan 2010 13:15:40 +0000 (21:15 +0800)
committerJason Rumney <jasonr@gnu.org>
Wed, 27 Jan 2010 13:15:40 +0000 (21:15 +0800)
commit0cb9f021d19fe76db98ff2e9229e9f8570905c44
treee374f05e0dedfeae4a984da0ae1dc1f2fac74a1a
parent98a06c6e3f184bbdfbc17aad4143a91fb0c6441a
parentc74aa70b45dfcc7733c5bb64b14186b72c6e63ae
Merged from trunk